ChangeLog fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92a221999ce7e76338123fc207ce926993134671..7fbb5cb960e3b6fa98137a15079488355737d2f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1942,7 +1942,6 @@
        * net/shr.el (shr-tag-img): Prefer the title over the alt text
        (bug#16537).
 
->>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * net/eww.el (eww-download-callback):